]> dgit.raspbian.org Git - gnome-shell.git/commitdiff
ci: Install dependencies when using custom destdir
authorFlorian Müllner <fmuellner@gnome.org>
Mon, 21 Jul 2025 19:36:27 +0000 (21:36 +0200)
committerMarge Bot <marge-bot@gnome.org>
Tue, 22 Jul 2025 09:15:15 +0000 (09:15 +0000)
Commit fd4320156c9 changed the `update-mutter` command inside the
toolbox to also install into the sysext extension dir, so people
who don't build mutter themselves can still use the sysext tooling.

Except they can't, because additional dependencies from mutter's
install-common-dependencies.sh script are missing as the script
is currently only invoked by the meson-build script.

Fix that by also running the script when running install-meson-project
with a destdir, as is done from the update-mutter command.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3805>

.gitlab-ci/install-meson-project.sh

index 8afd4079ec2e044e0b4809abb5832c56db71182f..61c2fa5f4bf13ccd672111e60b053f1cf1e43a24 100755 (executable)
@@ -102,6 +102,11 @@ for destdir in "${DESTDIRS[@]}"; do
     # don't use --destdir when installing to root,
     # so post-install hooks are run
     [[ $destdir == / ]] && destdir=
+
+    # also install dependencies when installing to a separate distdir
+    install_deps=.gitlab-ci/install-common-dependencies.sh
+    [[ "$destdir" && -x $install_deps ]] && $install_deps --destdir $destdir
+
     sudo meson install -C _build ${destdir:+--destdir=$destdir}
 done
 popd